Make the dumped output a bit more readable

By adding sections for each interface.

diff --git a/tests/a11y/accessibility-dump.c b/tests/a11y/accessibility-dump.c
index 522ed386dd74cf90e3431c067e02fbb0fdf86f0c..be0950b0b5cffcb6435a681f9dee4b5079de2ed9 100644 (file)
--- a/tests/a11y/accessibility-dump.c
+++ b/tests/a11y/accessibility-dump.c
@@ -272,6 +272,8 @@ dump_atk_text (AtkText *atk_text,
   gchar *text;
   gint i, start, end;
 
+  g_string_append_printf (string, "%*s<AtkText>\n", depth, "");
+
   text = atk_text_get_text (atk_text, 0, -1);
   g_string_append_printf (string, "%*stext: %s\n", depth, "", text);
   g_free (text);
@@ -298,6 +300,8 @@ dump_atk_image (AtkImage *atk_image,
 {
   gint width, height;
 
+  g_string_append_printf (string, "%*s<AtkImage>\n", depth, "");
+
   atk_image_get_image_size (atk_image, &width, &height);
   g_string_append_printf (string, "%*simage size: %d x %d\n", depth, "", width, height);
 
@@ -311,6 +315,8 @@ dump_atk_action (AtkAction *atk_action,
 {
   gint i;
 
+  g_string_append_printf (string, "%*s<AtkAction>\n", depth, "");
+
   for (i = 0; i < atk_action_get_n_actions (atk_action); i++)
     {
       if (atk_action_get_name (atk_action, i))
@@ -329,6 +335,8 @@ dump_atk_selection (AtkSelection *atk_selection,
 {
   gint i;
 
+  g_string_append_printf (string, "%*s<AtkSelection>\n", depth, "");
+
   g_string_append_printf (string, "%*sselection count: %d\n", depth, "", atk_selection_get_selection_count (atk_selection));
 
   if (atk_selection_get_selection_count (atk_selection) > 0)
@@ -350,6 +358,8 @@ dump_atk_value (AtkValue *atk_value,
 {
   GValue value = { 0, };
 
+  g_string_append_printf (string, "%*s<AtkValue>\n", depth, "");
+
   atk_value_get_minimum_value (atk_value, &value);
   g_string_append_printf (string, "%*sminimum value: %g\n", depth, "", g_value_get_double (&value));
   atk_value_get_maximum_value (atk_value, &value);
@@ -368,6 +378,8 @@ dump_atk_hyperlink_impl (AtkHyperlinkImpl *impl,
   AtkHyperlink *atk_link;
   gint i;
 
+  g_string_append_printf (string, "%*s<AtkHyperlinkImpl>\n", depth, "");
+
   atk_link = atk_hyperlink_impl_get_hyperlink (impl);
 
   g_string_append_printf (string, "%*sanchors:", depth, "");
@@ -392,6 +404,8 @@ dump_atk_streamable_content (AtkStreamableContent *content,
 {
   gint i;
 
+  g_string_append_printf (string, "%*s<AtkStreamableContent>\n", depth, "");
+
   g_string_append_printf (string, "%*smime types:", depth, "");
   for (i = 0; i < atk_streamable_content_get_n_mime_types (content); i++)
     g_string_append_printf (string, " %s", atk_streamable_content_get_mime_type (content, i));

diff --git a/tests/a11y/accessible-name.txt b/tests/a11y/accessible-name.txt
index 27a4d34d4a60c0d5f4d9f1ae1fec1dd411f5b1fa..cc427fdf61057ecfe0dc1415dcef88f3e2623e0d 100644 (file)
--- a/tests/a11y/accessible-name.txt
+++ b/tests/a11y/accessible-name.txt
@@ -10,12 +10,15 @@ window1
     name: Accessible name
     state: enabled focusable sensitive showing visible
     toolkit: gail
+    <AtkText>
     text: Hello World!
     character count: 12
     caret offset: 0
     default attributes: left-margin:0 right-margin:0 indent:0 invisible:false editable:false pixels-above-lines:0 pixels-below-lines:0 pixels-inside-wrap:0 bg-full-height:0 scale:1 rise:0 underline:none strikethrough:false bg-stipple:false fg-stipple:false fg-color:0,0,0 bg-color:56540,56026,54741 wrap-mode:word justification:left size:<omitted> weight:<omitted> family-name:<omitted> stretch:<omitted> variant:<omitted> style:<omitted> language:<omitted> direction:<omitted>
+    <AtkImage>
     image size: -1 x -1
     image description: (null)
+    <AtkAction>
     action 0 name: click
     action 1 name: press
     action 2 name: release

diff --git a/tests/a11y/hello-world.txt b/tests/a11y/hello-world.txt
index b9e20a3b3426a3a4c60482c561f4fbf6df1a1ad7..1714b4a1840fe10d15ca7350177abaef35b7db96 100644 (file)
--- a/tests/a11y/hello-world.txt
+++ b/tests/a11y/hello-world.txt
@@ -10,12 +10,15 @@ window1
     name: Hello World!
     state: enabled focusable sensitive showing visible
     toolkit: gail
+    <AtkText>
     text: Hello World!
     character count: 12
     caret offset: 0
     default attributes: left-margin:0 right-margin:0 indent:0 invisible:false editable:false pixels-above-lines:0 pixels-below-lines:0 pixels-inside-wrap:0 bg-full-height:0 scale:1 rise:0 underline:none strikethrough:false bg-stipple:false fg-stipple:false fg-color:0,0,0 bg-color:56540,56026,54741 wrap-mode:word justification:left size:<omitted> weight:<omitted> family-name:<omitted> stretch:<omitted> variant:<omitted> style:<omitted> language:<omitted> direction:<omitted>
+    <AtkImage>
     image size: -1 x -1
     image description: (null)
+    <AtkAction>
     action 0 name: click
     action 1 name: press
     action 2 name: release

diff --git a/tests/a11y/link.txt b/tests/a11y/link.txt
index 70e5bf49fbe3fd5bf944457f352b7f55b251774b..7866eff1e3232cb0b09ecf34d23cd72bd04ff994 100644 (file)
--- a/tests/a11y/link.txt
+++ b/tests/a11y/link.txt
@@ -10,13 +10,17 @@ window1
     name: Hello World!
     state: enabled focusable sensitive showing visible
     toolkit: gail
+    <AtkText>
     text: Hello World!
     character count: 12
     caret offset: 0
     default attributes: left-margin:0 right-margin:0 indent:0 invisible:false editable:false pixels-above-lines:0 pixels-below-lines:0 pixels-inside-wrap:0 bg-full-height:0 scale:1 rise:0 underline:none strikethrough:false bg-stipple:false fg-stipple:false fg-color:0,0,0 bg-color:56540,56026,54741 wrap-mode:word justification:left size:<omitted> weight:<omitted> family-name:<omitted> stretch:<omitted> variant:<omitted> style:<omitted> language:<omitted> direction:<omitted>
+    <AtkImage>
     image size: -1 x -1
     image description: (null)
+    <AtkAction>
     action 0 name: click
     action 1 name: press
     action 2 name: release
+    <AtkHyperlinkImpl>
     anchors: http://www.gtk.org

diff --git a/tests/a11y/mnemonic.txt b/tests/a11y/mnemonic.txt
index acfdb78768611a25887e610f1cb2b1ffbfad69c4..ea5dc31bf76a0c47edd9b6d8b11c7291d7bde9ed 100644 (file)
--- a/tests/a11y/mnemonic.txt
+++ b/tests/a11y/mnemonic.txt
@@ -17,6 +17,7 @@ window1
       label-for: entry1
       state: enabled multi-line sensitive visible
       toolkit: gail
+      <AtkText>
       text: Entry:
       character count: 6
       caret offset: 0
@@ -28,9 +29,11 @@ window1
       labelled-by: label1
       state: editable enabled focusable sensitive single-line visible
       toolkit: gail
+      <AtkText>
       text: text
       character count: 4
       caret offset: 0
       default attributes: left-margin:0 right-margin:0 indent:0 invisible:false editable:false pixels-above-lines:0 pixels-below-lines:0 pixels-inside-wrap:0 bg-full-height:0 scale:1 rise:0 underline:none strikethrough:false bg-stipple:false fg-stipple:false fg-color:0,0,0 bg-color:65535,65535,65535 wrap-mode:word justification:left size:<omitted> weight:<omitted> family-name:<omitted> stretch:<omitted> variant:<omitted> style:<omitted> language:<omitted> direction:<omitted>
+      <AtkAction>
       action 0 name: activate
       action 0 keybinding: <Alt>e

diff --git a/tests/a11y/notebook.txt b/tests/a11y/notebook.txt
index 8559e4d054b9ad874ff1244852f61a11b6d9702c..18258afcce60e6611622ab4563e7a1a72e43ec04 100644 (file)
--- a/tests/a11y/notebook.txt
+++ b/tests/a11y/notebook.txt
@@ -9,6 +9,7 @@ window1
     index: 0
     state: enabled focusable sensitive showing visible
     toolkit: gail
+    <AtkSelection>
     selection count: 1
     selected children: 0
     Tab 1
@@ -17,6 +18,7 @@ window1
       index: 0
       name: Tab 1
       state: enabled multi-line selectable selected sensitive showing visible
+      <AtkText>
       text: Tab 1
       character count: 5
       caret offset: 0
@@ -27,12 +29,15 @@ window1
         name: Yes
         state: enabled focusable sensitive showing visible
         toolkit: gail
+        <AtkText>
         text: Yes
         character count: 3
         caret offset: 0
         default attributes: left-margin:0 right-margin:0 indent:0 invisible:false editable:false pixels-above-lines:0 pixels-below-lines:0 pixels-inside-wrap:0 bg-full-height:0 scale:1 rise:0 underline:none strikethrough:false bg-stipple:false fg-stipple:false fg-color:0,0,0 bg-color:56540,56026,54741 wrap-mode:word justification:left size:<omitted> weight:<omitted> family-name:<omitted> stretch:<omitted> variant:<omitted> style:<omitted> language:<omitted> direction:<omitted>
+        <AtkImage>
         image size: 20 x 20
         image description: (null)
+        <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>y
         action 1 name: press
@@ -43,6 +48,7 @@ window1
       index: 1
       name: Tab 2
       state: enabled multi-line selectable sensitive showing visible
+      <AtkText>
       text: Tab 2
       character count: 5
       caret offset: 0
@@ -53,12 +59,15 @@ window1
         name: No
         state: enabled focusable sensitive visible
         toolkit: gail
+        <AtkText>
         text: No
         character count: 2
         caret offset: 0
         default attributes: left-margin:0 right-margin:0 indent:0 invisible:false editable:false pixels-above-lines:0 pixels-below-lines:0 pixels-inside-wrap:0 bg-full-height:0 scale:1 rise:0 underline:none strikethrough:false bg-stipple:false fg-stipple:false fg-color:0,0,0 bg-color:56540,56026,54741 wrap-mode:word justification:left size:<omitted> weight:<omitted> family-name:<omitted> stretch:<omitted> variant:<omitted> style:<omitted> language:<omitted> direction:<omitted>
+        <AtkImage>
         image size: 20 x 20
         image description: (null)
+        <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>n
         action 1 name: press

diff --git a/tests/a11y/range.txt b/tests/a11y/range.txt
index 574fab91bc221d1e09a83094dd581ea381f22c3d..75e3939fc352db8d87c4e98fc7b9c4b41fbdbd84 100644 (file)
--- a/tests/a11y/range.txt
+++ b/tests/a11y/range.txt
@@ -9,11 +9,14 @@ window1
     index: 0
     state: enabled focusable horizontal sensitive showing visible
     toolkit: gail
+    <AtkText>
     text: ‎45.5
     character count: 5
     caret offset: 0
     default attributes: left-margin:0 right-margin:0 indent:0 invisible:false editable:false pixels-above-lines:0 pixels-below-lines:0 pixels-inside-wrap:0 bg-full-height:0 scale:1 rise:0 underline:none strikethrough:false bg-stipple:false fg-stipple:false fg-color:0,0,0 bg-color:56540,56026,54741 wrap-mode:word justification:left size:<omitted> weight:<omitted> family-name:<omitted> stretch:<omitted> variant:<omitted> style:<omitted> language:<omitted> direction:<omitted>
+    <AtkAction>
     action 0 name: activate
+    <AtkValue>
     minimum value: 0.5
     maximum value: 99.5
     current value: 45.5

diff --git a/tests/a11y/text.txt b/tests/a11y/text.txt
index 716203427eb11aaadb0d511978848c9308104a58..8293910fd301ee8130839be276d29207e4d54234 100644 (file)
--- a/tests/a11y/text.txt
+++ b/tests/a11y/text.txt
@@ -9,9 +9,11 @@ window1
     index: 0
     state: editable enabled focusable multi-line sensitive showing visible
     toolkit: gail
+    <AtkText>
     text: Twas brillig, and the slithy toves
 Did gyre and gimple in the wabe
     character count: 66
     caret offset: 66
     default attributes: right-margin:0 left-margin:0 indent:0 pixels-above-lines:0 pixels-below-lines:0 pixels-inside-wrap:0 rise:0 language:<omitted> scale:1 fg-color:0,0,0 bg-color:65535,65535,65535 invalid:none invalid:false invalid:false invalid:false left-margin:true invalid:none left-margin:ltr invalid:left size:<omitted> weight:<omitted> family-name:<omitted> invisible:normal invalid:normal invalid:normal
+    <AtkStreamableContent>
     mime types: application/x-gtk-text-buffer-rich-text text/plain